Skip to content

[automated] Merge branch 'vs17.13' => 'vs17.14' #11618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: vs17.14
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the vs17.13 branch which have not been merged yet to vs17.14. I'm a robot and am configured to help you automatically keep vs17.14 up to date, so I've opened this PR.

This PR merges commits made on vs17.13 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout vs17.13
git pull --ff-only
git checkout vs17.14
git pull --ff-only
git merge --no-ff vs17.13

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14
or if you are using SSH
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.13-to-vs17.14'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/vs17.13-to-vs17.14 origin/vs17.14
git pull https://github.com/dotnet/msbuild merge/vs17.13-to-vs17.14
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14
or if you are using SSH
git fetch
git checkout -b merge/vs17.13-to-vs17.14 origin/vs17.14
git pull [email protected]:dotnet/msbuild merge/vs17.13-to-vs17.14
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro bot and others added 2 commits March 19, 2025 14:13
* Update dependencies from https://github.com/dotnet/arcade build 20250311.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25161.4

* Update Versions.props VersionPrefix

* Update dependencies from https://github.com/dotnet/arcade build 20250314.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25164.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <[email protected]>
@github-actions github-actions bot requested a review from a team as a code owner March 24, 2025 11:58
Copy link
Contributor Author

github-actions bot commented Apr 8, 2025

This pull request has been updated.

This PR merges commits made on vs17.13 by the following committers:

Copy link
Contributor Author

github-actions bot commented Apr 9, 2025

This pull request has been updated.

This PR merges commits made on vs17.13 by the following committers:

…ages (#11719)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250409.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25204.3 -> To Version 9.0.0-alpha.1.25209.1

* Update VersionPrefix to 17.13.25

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs17.13 by the following committers:

* Update dependencies from https://github.com/dotnet/arcade build 20250408.6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25204.5 -> To Version 9.0.0-beta.25208.6

* Update VersionPrefix to 17.13.25

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs17.13 by the following committers:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant